From: Eli Zaretskii Date: Wed, 11 Dec 2013 17:06:29 +0000 (+0200) Subject: Merge from trunk. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2035^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a34a8cd1e46594c5776f187dd98583bcb82f9bc0;p=emacs.git Merge from trunk. --- a34a8cd1e46594c5776f187dd98583bcb82f9bc0